projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e55404 6b54af2)
bitkeeper revision 1.1159.6.1 (411748d7-DyfJk-MOXRVdFnSV7ZYdw)
authormjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>
Mon, 9 Aug 2004 09:50:15 +0000 (09:50 +0000)
committermjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>
Mon, 9 Aug 2004 09:50:15 +0000 (09:50 +0000)
Merge xenbk@gandalf:/var/bk/xeno-unstable.bk
into wray-m-3.hpl.hp.com:/home/mjw/repos-bk/xeno-unstable.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
tools/python/xen/xend/XendClient.py patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc tools/python/xen/xend/XendClient.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.